changed to hpunit, remove unused points from the front