Fixes to vaccination
testing fixes