More tests, less warnings.