Some tweaks for testings