Tidy up following protractor tests

Part of #215
Work in progress