Fix Failing test case
Fix Failing test case
Remove deductions before adding new one
Make the code more moduler
Merge pull request #942 from mikeing2001/new_813

Fix Failing functional test