Added missing return statements in shapestest source