Revert "Made testing changes REVERT ME!"

This reverts commit d2e136a38868d65ca34aea534a20553022f7ba68.