Merge branch 'master', remote-tracking branch 'upstream/master'
fix(gradle): add executable property to gradlew file
test(entity): refactor entity tests
Merge pull request #22 from andresaraujo/tests

Refactor unit test cases for EntityTests