More tests and style/warnings.