Added @wip for additional files. Moved capybara code