Fix testcase I broke
Little more cleanup