Fix up index page & tests