tweaks to tests
merge conflicts