Fix for shape tests that might work
additional fixes for testing shapes