Helper updates and several tests