finally make tests pass