Added basic module plus unit tests