Fix broken tests and add tests for ThemeManagerTest

Change-Id: I12769a3385cdcbe71f2e216a405509477b427eca
1 file changed