More test cases

Try to work through the comparison issues