Added new test cases to fix bug

Signed-off-by: Herbert <herberthb12@gmail.com>