- Moved the addSort method to be called in the constructor
- Removed mock test methods from the user code