added tests, updated Changes