Prepare some controller unit tests

Change-Id: Ic1c4c139a3c8e0b0900a725a07f3df0928976ca4