It appears that this main module file mixes core implementation and material that is only used in test cases - do you think there's something we could do about that?