Minor revisions to functionality tests