Fixed a few test cases