Revert "Experimental change which switches behaviour of TestCode.java."

This reverts commit e32ea51b3c9fa4c7968a5fd63bfdf11069cbd0d7.