refactoring grand finale tests