More tests
Merge origin/master