Merge "Enhancements to modelled tests"