Adding @pfreixes suggestion on __init__.py and imports
Fixed init function. Now import works
Merge branch 'develop', remote-tracking branch 'origin'
Testsuite refactoring [ci skip]