Disable bad tests, update controller tests