Broken tests in to one file per method, and added support for supertest