Utility methods
Adapt tests to new utility methods