got tests working again :-(
merging to head

Merge https://github.com/HamidM250/S-Ware