BS-8590: Test refactoring