Fix values for next test, Try to pass third test
Merge branch 'release/v0.2.18'