Deleted old test files, added test for ActiveTheme.php. Minor changes to other files facilitate testing.