Test cleanup and minor fix to d4-user