Merge pull request #12 from SugarRecord/master

Push to Develop
Merge branch 'master' into develop
Fixed tests and splitted into different files
Merge pull request #17 from SugarRecord/testsFix

Fixed tests