I decided to remove the extra expectations for the time being. Let me know if there is anything else. Thanks!