Remove backup file
Inline error message for validation integration test
Use full error message for validation testing