Merge "Convert tests to consistent structure" into nyc-dev am: b91c9d54d7
am: b79e17cacb

* commit 'b79e17cacb6b43d727cccff51223ad2f7c984b74':
  Convert tests to consistent structure