Tests improved
Merge conflicts