modified tests fixed.