- implemented some more comprehensive test cases