Tidy up tests
Merge agent and server into one sbt project