Changes in EnquiryController to make it a service and be able to test it...

... in a unit test, not functional. Bugs fixed in dependencies for testing.