Fix unit tests... but break the whole thing
Fix it!