This fixes some of the tests failing