fix test setup after package upgrades
minor updates to tests