Upgrade jmockit to 1.13 and use strict expectations

Current code was written as for strict expectations but did not check the ordering
of operations.
Renamings and docs addressing review comments