Undoing some changes because they were causing actors to fail when illegal callbacks were used. Changed tests to reflect this.