Fixed broken tests. Changed test script