appears to be fixed but need to test them more
error fixed
Merge branch 'preventive-module' into preventive-service-tests
made clean changes