Fixes. Extended Tests.