test(container): re-write and reorganize tests