refactored callback tests