Added more tests to unittest framework