almost all controller tests pass too now and removed deprecation warning