Added test convenience functions