More comprehensive tests.