Refactors to include options parser.
Corrects test phrasing.