TE-849

This passes fine in firefox; however in chrome, the click is occurring before
the page is ready; and then the click itself is not specific enough. Also
refactored the add button method so it more-clearly returns the expected
end-state.