Fix for the failing test, and also fixing the test