Checkpoint progress on unit tests

Bugs to be fixed

Signed-off-by: David Noble <dnoble@splunk.com>