Reorganize tests a bit and fix some bad names.  More openwire details.