more protractor tests and some refactoring