initial homepage integration test and related code fixes
fixed merge conflict
Merge pull request #86 from cdcueva/new_tests

New tests