Fix broken stuff
Delete useless controller tests