Removed out-commented code, added a comment, updated test