Small tests and structural changes.