StyleCop changes and test methods renaming