Add integration tests for resolving empty value id workbench data fix
and refactored some unit tests.