Updated tests due to typechecker changes