Make tests more scalatest-like, improve.
Move scala file to scala directory.