Use more comprehensive tests