Fix up conditions for test