Continued test endpoint stuff