Refactored home page contents & added a couple of tests.