Refactoring of mountains to improve test coverage