refactor some tests and start considering selenium
Try to handle malformed feed a bit better