Added test data auto expand