Fix failing test cases and add some more