Added new test case with bug

Signed-off-by: Herbert <herberthb12@gmail.com>
Applied new features to fix bugs

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