Cleaned up ContainerNode unit tests a little