Added some further tests