Removed NumValTest.scala from src to test folder.
Refactor to original package.  Fix ScalaTest fails.  Fix deprecations.