i) Improved test functions and organization of test helpers
ii) Added basic tests for module inclusion

TODO
i) fix errors found