Unittest skeletons
Fix unit test