Getting close.... but there are still some minor timing issues against the smoke build. I am increasing a few timeout values within postgreSQL & commands files