Got the theme class tests passing.