fixed failing unit tests after shuffling responsibilities around