Fixed incomplete merge (system-test)
Formatting