#12 Acceptance test
Fix broken acceptance tests from implementation of #12