modify one-to-one padding and tests