rearranging some, adding a couple of tests