Expand callback test coverage