fix'd stuffs in tests