Fixing up testing issue