Added some additional tests