Improve stories tests