Bringing in common module and tests