Add assertSameShape() variant, reindent code, remove useless headers