Update metamodel test code
update metamodel tests (iterator is now a method)
encode annotations of class initializer parameters
Add annotations to parameters