[ADD] Automatically adding *
[ADD] Test case