#586 fix tests
#589 fix requirements