Updated SoftwareUtil and added tests
3 files changed