Config update
Major tests