Made condition test more readable

Ignore-this: fb10031a2d6938f626b46f7cf2caaeff

darcs-hash:20100909132600-b22ec-64aca0aee6ede584fe06ae1bf252bfcc64d6d568
Improved tests to be more efficient

Ignore-this: 106cc90ff7c818c1a6974b3feeb92827

darcs-hash:20100909155054-b22ec-bcc88ba780f09db93fddf3f5c9249219286fc7ea