remove comments and fix test