Added Solvent test. Updated other tests.