Added a few tests...