1. 'Commented' out derivative event tests for now.
1. Updated main, less ugly now. 2. Includes event testing.