A few improvements suggested by scalastyle, but most of it was non-sense or contradictory
in tests we should be mocking using IScope
making some classes final
making some classes final
making some classes final
making some classes final
making some classes final