Refactored tests folder, obfuscation tasks and util.