Changes for padding tests