[Task] Added more test functions