Revert "Testing fixes"

This reverts commit 77a9b2476b9a1bb90c08e275e7f75aa33c81e0d9.