Fix unit tests for software entity