Handling home page a bit differently because it's special
Fixed some broken tests