Some commit
Merged with origin
Added new tests
Added new tests