Typo and fixing up tests