misc updates to tests
merging