Apply code review feedback - test now consistent with clearwater-infrastructure