Improved AdherentTest and added testAdherentMakeSubstitution