Fix use of getContaining, tests