Merge branch 'stable'
Fixing unit tests