FIxing typo and tests