Controller test case improvements

@ibawt, @kristianpd 

Minor improvements to @dispatch.