Tests all fixed up
Added an all-inclusive checkpoint test