Refactored the module a bit and started to add more functionality.
Tried to improve testing process.