Merge branch 'zeeman/eav-testfixes' into eav