Fixed failing tests after refactoring Stockpile