Additional Tests and functionality

Signed-off-by: Vince Montalbano <vince.montalbano@gmail.com>