Updating tests to pass with most recent code changes