Improve issue test