fix tests
improvements