Updated offset function for correct functionality
Updated offset tests to ensure functionality
Merge branch 'feature/fix-offset-calculations' into develop