Slightly more test code