Moving tests elsewhere.
Actually included the new containers. They weren't in the last commit.
More testing. Looking OK.