Removing debug TODOs
Re-enabling final test