refactoring tests
zMerge branch 'feature/supplementTests'