Fix for failing unit test on Response save