Fixing borked unit tests