Satandardise layout.
Update tests.