clean up tests names & resharper warnings