Rolled back old test code