update tests
minor fixes