[KFSQA-681] changes made based on crucible KFSQA-12 review comments.