Fix remaining reference to it
Allow checking for correctness
Update tests