Fixing confirmation page and test store2