Added helpers for test refactoring