Do the tests fail because the callback queues have nothing in them, due to the Build.Version check? If so then maybe just do the same check here and assert the queues are empty, since that is the correct behavior in that case. Otherwise, maybe just wrap each test with a Build.Version check...