fix activity service and test to reflect new columns in database view