Offset class added with tests