Standardization. More tests.