Minor refactorings

 - Make most of the Acceptance tests run in process
 - Minor tweaks