Correct tests (del working now)
Merge origin/master