Fix controllers + tests