Home stretch changes for testing / verfication