Add tests to verify placeholder values

Fix code review comment and formatting