Fix for deprecated feeds
Fixed unittests
incorrect usage of dictionaries, NEVER use pop, use getter
tobias is an idiot