Fixed few bugs missing for production. Added more parameterization to skipTests from command line -DskipTests=true