update tests
fix up more tests