Re-fixing. Need a better way to test things like this...

Wait, tests! Right! /doh