Reverted some test code