Tests refactoring
Refactor bulk tests