changing tests to use new generated code