Refacoter feed manager and fixed some cucumber tests