* Cleanup config merging and adding defaults * Optimize and update tests * Do not mix entry and yaml config * Make sure hass.data is initilized * remove check on get_mqtt_data * Tweaks to MQTT client * Remove None assigment mqtt client and fix mock