Task controller tests fixing