Updating tests to work with terms