I like working on skinny angles for water, cover. Multiple entry exits. Any of these marks allows you to correct for "cheating", avoidance and ultimately gives the dogs confidence to attack various water and cover features. Train harder than what your testing for. Quality instead of quantity. Keep your standards very high.