added container() to interface
updated tests (mock mostly)