Revert "Cleaned up tests"

This reverts commit bb558dab1f9dfe339d8dc4d10871a7db9ee06b96.