Added new type signatures, added new tests, and fixed failing tests