Updating tests to include additional conditions