adding/fixing old tests
Merge branch 'develop' of github.com:Stratio/crossdata into develop