DBZ-5 Refactoring of tests