fixing test infrastructure