some minor changes to test code: