Added more tests to unit test