Switching to refactored selenium tests