Fix unit tests for software and CPU (may have made some modifications recently