Tests fixed
Merge commit 'a9b5247ce14a0ce3bd0a14e2f62670050056d8ef'