Minor test code clean up