Fixing testing issue