Remove extra newline from CMP mock server error and add TODO on using request template