Added more test functions