Update schemes
Execute tests again static scheme
Replace WithWith with With