Added more test code.