lrlebrao Removes leftover comments and tasks, adds more tests