Fixed a couple of failing test cases