changed a lot of tests