Tests updated to use supertest