Merge changes Icdee3eb9,Ib3f5d12d into nyc-layoutlib-dev

* changes:
  Separate render and verify in tests
  Fix tests when running from the command line