Added a few, and fixed some unit tests.