Revert "fix test and changes"

This reverts commit 6dd283ed7b96f36ec00fc5ae29d6f0c2d43e95fa.