Package+ws testing fix