Added test utilities