Rest target, factories, test changes/updates