Add tests
issue