Mild cleanup of LAP test code