Add Lap() and Laps(), improve tests