remove paperclip
fill all skipped tests, random adjustments