Fix the tests failing