Finished test script
Changed test script slightly
Merge branch 'master' of github.com:pxpeterxu/flexidata