Added more comprehensive test