Removed some unnecessary code.
Reworked controller tests. Added renderers tests (incomplete).