Updates to test-theme per @apeisa's suggestions.