Try again to fix tests in v0.2