* Added more tests