More noodling around for test cases.