Tidied up the tests some more.
Added support for --volumes-from.