fix bunch of tests