Removes debug code
Adds new test