Fixed typo and added (and removed) some tests