Fix tests, rename waiting records preference