Bit of cleanup and tests for basic frontpage