Paste bugfix, more tests.
2 files changed