Additional tests and closing resolved issues

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>