Improved tests to verify callback-driven and callback-less each time a test is run.