Fixing Linux syntax errors and tests for Events 2.0