Tweak + tests.