Small Fix and Tests.