Added a few tests