Fixed existing tests after implementing Switchboard and logging