added test for enquiry controller
Merge commit 'ebfd3ede5acb9d0375aab2beb191d85303a5a53c' into HEAD