Update helpers [ci skip]
Marge tasks [ci skip]
Cleanup test suite
Use module_function for module instance methods [ci skip]