Reorganise parser tests