Added more test code