Check that we required exactly one file
Tweaked the deleting failed exception message
Flush the saved models on deletion
Improve saving tests and add deletion tests