Add test & FIX BUG found by test