Extend unittests, checkpoint.