Change test method names as per review comments