fix test. will combine with previous commit after phunt reviewed.