Some testcases, bugfixes, new conjugations