Fixing the tests based on a code review with Matt