Add assertions to several tests to prove only the expected callback method is called
Replace createMockCallWithType(Class) with Mockito.mock(T... reified) which obviates the need to even have a separate method. The delcarations had to change to declare the type explicitly, otherwise Mockito can't figure it out.