WIP - adding unit tests for IntegrityUtil