Remove old references to test code
ALlow use of engine
Implement validation response