Fix test schema and fix basic test syntax errors