Fixed tests

Following the change from Attribute mapping to Convention mapping as the
default, some tests hadn't been updated and would fail if they were run
individually or if the whole solution was run but the order differed.