fix test
fix test
fix tests and code