improved container tests
fixed tests; mostly by using api instead of internal