Mainly added tests, YAML model classes and renamed interfaces