Improved build speed in testing state
This will create a new commit in order to revert the existing changes.
