Bug Fix CON-64
"Bug CON-64" refactoring of code
fixes to pull request for CON-64
update suite