Adding tests
Merge