fixes for theme test