Added further test code.