Cleanup some xmodule tests imports and data directory location
Merge pull request #655 from rocha/cleanup-xmodule-test-imports

Cleanup some xmodule tests imports and data directory location