Update NotEmptyTest tests to use data providers where possible
Merge branch 'feature/#5879-not-empty-test-data-provider-refactoring'

Close #5879