Fixing my shamefully incorrect tests!