Bug fixed.
Updated some tests and fixtures.