Update and add unit tests
Modify bindings to align with Cybox binding changes