Add more test stuff.