7.1 upgrade + test improvements