Update unit test along with Core.php