refactor Home page and more tests