tests rewriting in progress
scalatest updates done