Fixed feeds and cleaned tests