Test code cleanup.
Merge branch 'dev' into item-update-delete-to-midje