Fix typos
Fix tests