Fixes to support stockItem tests.