Add functions needed for testing
Merge