Acceptance tests fixed (except final)