Remove cruft
Mix up test case a bit