added tests
minor changes