Fix failing unit test.
Merge branch 'development'