fixing up some tests