new tests
minor corrections