Fixed failing tests, broken publisher