completing containers10, adding unit tests