Fixed a couple test cases