Fixed functions so we're back to passing the same amount of tests.