Change tests to conform

Hopefully my last push on this matter

Auditors: eater