(feat) implement supertest and clean up client