Several Headless Tests

Fix #41
Fix #42
Fix #43
Signed-off-by: Sheik Hassan <solergiga@yahoo.com>