Add module.php to code coverage test
Fix minor bugs