Add tests, update sbt assembly stuff