Make some fixes to the tests

Add a layout file for the tests to use
Fix some of the equality tests
Make failure messages for comparators better