Encapsulation fix and test update

Fixed encapsulation. New tests for coords added.