Modify test code following review from Vladimir