Fix tests
Bump version: 2.0.3 → 2.0.4
Merge branch 'develop'