Added test interface and data generator interface