More fixes
Added events test file.