Add groups

Added Fiber Channel switch and storage group
Add test output
Comment out name match output, too noisy