Commented out more test code