shaped up some asserts and tests to account for recent changes due to
diamond square interface. All tests pass.