Make test actually work.
Merge branch 'develop'