test_shapes for sam
Merge remote-tracking branch 'origin/nick'