Rework failed test
5 files changed