Finish up helper tests