Break more function out of support and add explicit unit tests.

Change-Id: I892b3d5f31da820b216a26bf9750394044ced72c
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>