fix tests
mostly fix tests