Slightly refactoring slicers
Small refactoring in mock objects