Copy updates. rebase is not my friend :(

- application => claim
- ' => ’
- updated tests