Just fixing up some fucked up test cases