Started reworing the tests
More tests reworked
All test rewritten :-D
Prep for testling
Merge branch 'improving_tests'