Fix mock API method and some Stylecop