Added module support and tweaked test coverage handling.