Review comments & test fix