Refactor unit tests to clear database, removed DatabaseTester as it's
functionality is now redundant
Modified code so that ClaimToken may be removed from Email