resolved some silly nosetests complaints. tests remain a bit disorganized, but usable.