* fixed the persistence test for Lease
* (ISSUE - one test fails because of equals method in Lease)
* fixed some minor issues causing building to fail