Fixed two tests that did not pass anymore due to typechecker changes