Work in progress.
Fix test.