- fix failing tests caused by scoping problems and instance_eval