Added more test cases; fixed problem with + and *