Added more test code

It isn't running perfectly but it's almost there