change: refactored test; add: tests for module pattern