Reformat tests
Return error for incomplete parse
Expand tests