Added some more test functionality