Adapted tests to new context resolution method