fix previous commit & adding tests

okay, okay…