Update to test-support 0.3.x