Add more testing
Add some more testing