Diagnostic and 404 interceptors; test driver updated.