Add tests
Merge from remote