Re-added and updated unit tests for Theme and ThemeManager classes.

I've re-added and updated the unit tests for the Theme and ThemeManager classes.  Please let me know if your run into any issues or if you think I need to make any changes.

Thanks,

Mike