Add total_target(), update tests