Testing fixes
tests resharper templates