Add a bunch more testing