Reverted test utils and build changed incorrectly commited.