restructure tests a little more break type tests down to be table driven, so errors are a little easier to decipher