added tests
cleanup