#569 fix tests
#569 fix tests