Fix validation tests to use new API
Update version annotations
Fix api unit tests