Containers

Logic for checking whether something is in a container and logic that something is contained within a container.

Also fixed the bug whereby a single test failure aborted a test run