Rolled back some test code