Added more assertions to unit tests