Removed expectations for smaller and faster binary. Code review.