Unifying test sizes and minor layout changes