make tests pass on Felix