Contributed minor revisions; still fails test