Minor misc tidies

This test is in the wrong place. The rest of `AbstractEntityLegacyTest` is for constructing entities directly, whereas this uses the `EntitySpec` so is not "legacy". It should probably be in `EntitySpecTest`. But that doesn't need addressed in this PR.