refactor old theme tests