All tests now passing.
Merge remote-tracking branch 'zeeman/eav-testfixes' into eav