Forgot to add the test changes to the previous commit.