[#31] Create finish! method and refactor test