Amended with changes - I think this should have shown in prior amend. Also, made the last test pending - it still doesn't pass - same error message.