Try to fix testing issue