Fixed test
Removed debugging statement
Removed TODOs