more ip tests

and did a little reorganizing too