fixes, end-to-end tests

@feiranwang  Add comments, explaining why it is commented out.