Make the one test there is actually pass
Fix exception handling
Add some tests so that I understand what the hell I'm changing
Allow us to discover docker containers against the newer API