Added test
Taking master version