Testsystem enhancements, 7 testcases failing only anymore. TODO: Look at conditional deduction.