FIX imports and test from other dir
Merge pull request #44 from hayd/fix_imports3

FIX imports and test from other dir