Tidy up + move feed processor + add feed items test