Added more tests, rationalised container set+get methods.