Remove --test flag and refactor the codebase

[udda1996]

Description:
Currently we have included a --test flag to avoid updating the tool for test purposes. Sending this implementation to the production and to users subsequently is not the best practice to follow. We need to remove this flag and have a patch to add this change back in the code for build and test purposes.