Change the DEBUG text to something a bit friendlier
Update tests