Package tests fixes