moar fixes from broken test