added tests.
modified scripts