Added more assertions to unit test framework