cleaning up some setup tests