Reworking test repository to start working on the main service tests