Fix compiling of the tests after the refactors