separate tests more in time.
and clearly show the overlap
Merge pull request #28 from Incubaid/unit_tests_fixes2

separate tests more in time.