Added software tests
Merged