Complete testing, change back to production code