Issue #130 - Fixed VolunteerService code; fixed and added tests

Some more ongoing Issue 130 work.