Test modified to delete data after each test
Merge origin/master
Merge origin/master
Modified Entities for test purpuses