The recursive_keyword_calls_by_template test case was actually wrong, so fixed the situation by changing it and creating a new test (which still fails).
Split a failing test method to two tests. They both still fail.
Refactored some code that has to do with some failing test cases.
Killed a few random compiler warnings.
Refactored a long method into several shorter ones.