Fix tests.
0.2.18
Merge branch 'release/0.2.18' into develop