refactor tests for new context