Add some more testing