refactoring of grand finale tests to make sure everything is tested