Add structure for remaining tests