Merge "Add useful helper functions for tests"