Made the tests more mockable more easily woooooooo lololol