Revert "Trying to get the tests back up and running again."

This reverts commit 6d2f5aabd31e8812f10a7a26bc9c8324f30d9ee9.