More test code and test tools