fixed tests, added another
Merge to head
Merge https://github.com/HamidM250/S-Ware