Various conversions from 5.0 tests