Update ScalaTest and scala-maven-plugin
[scala] Cleanup and minor improvements