Add tests (to be rebase)