Remove ugly hack now that we're using newer mockito.

Several tests were failing due to the hack not correctly testing transitions, so fix those as well.

Fixes: 331799060
Test: better now
Flag: NA
Change-Id: Ie8d9d297e69b59d994865f410a660745d426e9ee