Could you add the test before I merge this PR ?