Added sauce labs user setup step
Refactoring.
added another test, fixed some issues