Tidy up tests somewhat
Fix up tests for associativity