Adding SoftwareTest and fixing associations.