more tests for shapes
adjusted tests
fixed vector insert at end
changed expression to satisfy clang