Added more test implementation