Removed debugging statements
Rename some things in the test file