Modified test infrastructure so that everything passes