Added some Tests