convert to paver, add tests for module-level tokens