Cosmetics in script usage
Increase test coverage