nitin: add optional source name in error messages (for tests)