remove comments and improve test