Fix home page. Fix unittest to pass