Add tests
More tests