Moved controller tests to directive tests, E2E proving to be a nightmare