Fixes to the testing system to implement some more simple unit test