Adding some more test tools