One test addition requested; otherwise the rest looks good.