Complete refactor, added page object to organize, all tests pass