Incremental commit, unit tests pass again

Signed-off-by: David Scott <dave.scott@eu.citrix.com>