Merge pull request #8 from smn/feature/fix-tests

Feature/fix tests
Merge branch 'feature/add-faq-listing' into develop
Merge branch 'develop' into feature/respect-ordering