Merge "Convert tests to consistent structure" into nyc-dev