Move tests to nyc3