Various updates of helper modules and unit tests