fixed model duplicates, added endgoal tests