Yesterday
merge from test_generator_snapping