Tests adapted.
fixed test cases.