fixes, end-to-end tests

@feiranwang  Same here, column order