Unit tests back to snuff
Command and Event tests
Tests and cleaned up Correlations