Added some more test helpers