Refactored some Docker tests to be more generic.