Small layout change in the index page
Fix unit-tests; ignore a couple of place that we do not test