added wineform and improved e2e tests