Updated tests to work with ThinWire 1.3-SNAPSHOT