T658-0 Migration of old tests