package update + test fixes
Merge pull request #2112 from sebv/uiauto-cleanup

package update + test fixes