WIP as callbacks failing tests