Clean up the test db data issues, refactored a test that was deleting a
record, and fixed the updateCalculated so that it doesn't run on delete.