Start of adding Shape tests