Added test controller, improved verification of submitted data