add new test
fix tests
add new test
Revert "add new test"

This reverts commit 76c233819c659d0d66bfdb74279a7b5d9badbcd6.