Clean up Resharper warnings.  Made GetNewPosition Static and updated test