Making test more flexible...