initial work for upgrade, mark not ported tests as incomplete