Add MacSoftware test.
Move SoftwareTest.
Add IPadSoftwareTest.