added tests, other updates