Refactor - Improve test readability using fake commands
Refactor - Simplify by using fmap
Fix a subtle bug in the order of parameters.