Decoupled client, server and api
starting to alter tests