solution for the wine testing problem
clean up code