Revert "fix tests"

This reverts commit d7677d05c9386ef81a4dc7b671ad6d960ff548cc.
Revert "Revert "fix tests""

This reverts commit e680a23516812bb21df95632098dbdb2fa0e6abc.
fix rules