Added some more test code