Fixes. Test added.