A couple new F&A scenarios. Tweaks to existing step defs to enable re-use of code.