Fixed tests

Fixed the rest of the test cases