Further refactoring. Good coverage.
Added driver.close() in golden path to end test properly
uses Firefox.