Reorganise tests
Add options for containers to Service
Allow options to passed to start_container