fix test (merge with master)