Added markup / theme controller tests. Increased test coverage to 56%