Support Tests
Test Cleanup
Cleanup Imports
Adding tests for callback handling