Pass tests in 0.4 without extra packages