Refactor static mount to make it testable