Revert "more tests and tests and tests..."

This reverts commit b67311c854e98f3eef6e0e64155bb8a1d5122736.