Variety of layout improvements and test data improvements