Minor misc tidies

+1 -- i'd be in favour of removing `ApplicationBuilder`.  the `TestApp.Factory` call feels good for most test uses.