Self assignment fix. New tests.