Get tests caught up with code. 

Title logic changed in #1085.