Pass record instance around instead of guid, get rid of unnecessary tests