Added whodunnit to import process and tested