Fixing syntax issues caused by a merge in InheritableTest.php
Changing the SoftDeleteTest.php in a way that avoids the test failing when running in a group because of the time differences caused by the longer run time.
Merge pull request #121 from burzum/develop

Develop