Add more expectations for requirement coverage