Updated Controller tests