Fix breaking test and remove commented code