More fixees for tests