Switch test to production, delete old