Adds more testing and begins to change keywords to search for element