Fixing up some test issues