Refactored MVP to be private class, issues remain with test equivalences