improving/fixing tests #1815

Closed alichaddad closed 5 years ago