Fix broken test suites after acceptance criteria changed