Tests setup

This PR introduces various small fixes to the module, as well as tests setup, which was broken so far