improved callback tests