made date a year
added database cleanup after test
added extra fields for saving