tweaks (tests now succesful again)