BUG 8010: Correct a few syntax errors, and moved tests