Also adapted tests