Revert "Test 1 fixes"

This reverts commit 6bf1caf18cfef6c2d72a4f7173cf9c8c1dd0f222.