Replaced some assert statements with InOrder verifications. Additionally, removed some superfluous assert statement which were functionally covered by mockito.