Got test back to green after refoctor to module based solution