added supertest, some changes after tests