Fixes for event completion
Debug statements
Work on test
Work on test