fixed more tests?