Added in a couple more test
Added in a bunch more test