I think we need to revisit some of the methods from Base as I feel that importing it outside tests is a sign of something poorly designed (not to mention this here will cause a cyclic import issue)