[gh-21] - Refactored has_shape? to return multiple types and started adding tests