Added a few extra unit tests, just to be sure