Adds doccer module and extends unit tests