Failed test after final merge from master branch into WithStore