switched to mintest, renaming and restrucutring to module mixins