Refactoring config, moving around retrieval tests and adding new.