Fixed test failures.
Release 0.4.1