More controller testing