Using module function instead of instance

This adds one more level of code coverage.