@senny Improved Test cases.