added tests, to be expanded