Fixed another few test-cases