ENSIME + fixes for tests

Works with new sbt