Refacting Base module specs