updated tests
minor fixes