* Properly change tests what were formerly incorrect
* Clean up the options properly