Test tweaks, fixed last feed in model
Minor refactoring
Lock