Added test support utilities