Allow classes to reside outside of test class.

Adding support for extra classes being redefined to the test framework.
Rewriting lambda test a little, extracting classes with lambda's to top
level.