Tightened-up the test coverage around parameter parsing & handling
Fixed indentation