Merge "Fix slow package scheme test"