polish and simpler test