test refactorings and context changes