Flexibility.
Fix tests.