Minor tweaks for testings