package update + test fixes