Add yet more test cases and some refactoring
Add yet more test cases and some refactoring

Signed-off-by: Stefan Berger <5c96973112e540fb909b13997fcd087e5bfbee96@linux.vnet.ibm.com>

sastryduri/agentless-system-crawler,cloudviz/agentless-system-crawler,sastryduri/agentless-system-crawler,canturkisci/agentless-system-crawler,cloudviz/agentless-system-crawler,canturkisci/agentless-system-crawler