Fixed syntax errors, commented out event test (rename schema?)