HPPC-10068 Various changes following review and new test case

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>