Fix tests
Revert "Fix tests"

This reverts commit f117478aa185ab8867a9ca49fd264bcbb8d607ac.