Updated test callbacks