Changes to accomodate restructure of forms-angular services.  Add (very basic) test
Fix test