Adapt tests to use on