Some tests improved
Merging errors