Added test
Merged